Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 28 Mar 2010 11:41:31 +0000 (11:41 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 28 Mar 2010 11:41:31 +0000 (11:41 +0000)

Trivial merge